Revision: bazaar--devel--1.4--patch-61
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sat May 14 14:17:20 EST 2005
Standard-date: 2005-05-14 04:17:20 GMT
Modified-files: commands/resolved.c commands/undo.c
    libarch/conflict-handling.c libarch/project-tree.c
    libarch/project-tree.h tests/test-undo.sh
New-patches: jblack@gnuarch.org--2005/baz--undorelative--1.4--base-0
    jblack@gnuarch.org--2005/baz--undorelative--1.4--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-61
    thelove@canonical.com/bazaar--devo--1.4--patch-38
    thelove@canonical.com/bazaar--devo--1.4--patch-39
    thelove@canonical.com/bazaar--devo--1.4--patch-40
    thelove@canonical.com/bazaar--devo--1.4--patch-41
    thelove@canonical.com/bazaar--devo--1.4--patch-42
Summary: merge from thelove
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2005/baz--undorelative--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-35

 * jblack@gnuarch.org--2005/baz--undorelative--1.4--patch-1
   Undo now handles relative files; minor refactoring of resolved; new arch_project_tree_rel_path_from_user_input

 * thelove@canonical.com/bazaar--devo--1.4--patch-38
   performance tuning branch for baz based on MacOSX performance

 * thelove@canonical.com/bazaar--devo--1.4--patch-39
   overhaul of ancestry api and internals to use exceptions, arch_patch_id and talloc. includes portions of John Mienels refactoring work

 * thelove@canonical.com/bazaar--devo--1.4--patch-40
   prevernt talloc_freeing non talloc strings during arch_tag_cacherev

 * thelove@canonical.com/bazaar--devo--1.4--patch-41
   overhaul annotated-file api to use exceptions and talloc

 * thelove@canonical.com/bazaar--devo--1.4--patch-42
   Undo now handles relative files; minor refactoring of resolved; new arch_project_tree_rel_path_from_user_input

